Rename find_domain_by_id() to get_domain_by_id().

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/acm/acm_core.c b/xen/acm/acm_core.c
index fdac3dd3e56caf475b8286b7dad51da132fca394..5ab04e8b3ccbb2699a5621a0855ba69e3e665b12 100644 (file)
--- a/xen/acm/acm_core.c
+++ b/xen/acm/acm_core.c
@@ -276,7 +276,7 @@ int
 acm_init_domain_ssid(domid_t id, ssidref_t ssidref)
 {
     struct acm_ssid_domain *ssid;
-    struct domain *subj = find_domain_by_id(id);
+    struct domain *subj = get_domain_by_id(id);
     int ret1, ret2;
  
     if (subj == NULL)

diff --git a/xen/acm/acm_simple_type_enforcement_hooks.c b/xen/acm/acm_simple_type_enforcement_hooks.c
index 77e1062408b11003b810445f10e39d20affb7d7f..b5b931fa6b37222bcb4aaa89eb36f5eefb60e561 100644 (file)
--- a/xen/acm/acm_simple_type_enforcement_hooks.c
+++ b/xen/acm/acm_simple_type_enforcement_hooks.c
@@ -205,7 +205,7 @@ ste_init_state(struct acm_ste_policy_buffer *ste_buf, domaintype_t *ssidrefs)
                 ste_rssidref = ste_rssid->ste_ssidref;
             } else if ((*pd)->evtchn[port]->state == ECS_UNBOUND) {
                 rdomid = (*pd)->evtchn[port]->u.unbound.remote_domid;
-                if ((rdom = find_domain_by_id(rdomid)) == NULL) {
+                if ((rdom = get_domain_by_id(rdomid)) == NULL) {
                     printk("%s: Error finding domain to id %x!\n", __func__, rdomid);
                     goto out;
                 }
@@ -245,7 +245,7 @@ ste_init_state(struct acm_ste_policy_buffer *ste_buf, domaintype_t *ssidrefs)
                         __func__, (*pd)->domain_id, i, sha_copy.flags, sha_copy.domid, 
                         (unsigned long)sha_copy.frame);
                 rdomid = sha_copy.domid;
-                if ((rdom = find_domain_by_id(rdomid)) == NULL) {
+                if ((rdom = get_domain_by_id(rdomid)) == NULL) {
                     printkd("%s: domain not found ERROR!\n", __func__);
                     goto out;
                 };
@@ -507,8 +507,8 @@ ste_pre_eventchannel_unbound(domid_t id1, domid_t id2) {
     if (id1 == DOMID_SELF) id1 = current->domain->domain_id;
     if (id2 == DOMID_SELF) id2 = current->domain->domain_id;
 
-    subj = find_domain_by_id(id1);
-    obj  = find_domain_by_id(id2);
+    subj = get_domain_by_id(id1);
+    obj  = get_domain_by_id(id2);
     if ((subj == NULL) || (obj == NULL)) {
         ret = ACM_ACCESS_DENIED;
         goto out;
@@ -552,7 +552,7 @@ ste_pre_eventchannel_interdomain(domid_t id)
     if (id == DOMID_SELF) id = current->domain->domain_id;
 
     subj = current->domain;
-    obj  = find_domain_by_id(id);
+    obj  = get_domain_by_id(id);
     if (obj == NULL) {
         ret = ACM_ACCESS_DENIED;
         goto out;
@@ -595,7 +595,7 @@ ste_pre_grant_map_ref (domid_t id) {
     }
     atomic_inc(&ste_bin_pol.gt_eval_count);
     subj = current->domain;
-    obj = find_domain_by_id(id);
+    obj = get_domain_by_id(id);
 
     if (share_common_type(subj, obj)) {
         cache_result(subj, obj);
@@ -633,7 +633,7 @@ ste_pre_grant_setup (domid_t id) {
     }
     /* b) check types */
     subj = current->domain;
-    obj = find_domain_by_id(id);
+    obj = get_domain_by_id(id);
 
     if (share_common_type(subj, obj)) {
         cache_result(subj, obj);

diff --git a/xen/arch/ia64/vmx/vmmu.c b/xen/arch/ia64/vmx/vmmu.c
index aaf40556740616e1926eb3cc4719a80281a98f77..625bf6dbcf25c87cd89c445bcd93c8dc8614a8d8 100644 (file)
--- a/xen/arch/ia64/vmx/vmmu.c
+++ b/xen/arch/ia64/vmx/vmmu.c
@@ -49,7 +49,7 @@ u64 get_mfn(struct domain *d, u64 gpfn)
         d = current->domain;
     }
     else {
-        d = find_domain_by_id(domid);
+        d = get_domain_by_id(domid);
     }
  */
     xen_gppn = arch_to_xen_ppn(gpfn);

diff --git a/xen/arch/ia64/vmx/vmx_hypercall.c b/xen/arch/ia64/vmx/vmx_hypercall.c
index 08726390f496c20ba93470932c23b638a5f660d4..24bde7d094275cca2484476566e23f41e681f618 100644 (file)
--- a/xen/arch/ia64/vmx/vmx_hypercall.c
+++ b/xen/arch/ia64/vmx/vmx_hypercall.c
@@ -53,7 +53,7 @@ static int hvmop_set_isa_irq_level(
     if ( op.isa_irq > 15 )
         return -EINVAL;
 
-    d = find_domain_by_id(op.domid);
+    d = get_domain_by_id(op.domid);
     if ( d == NULL )
         return -ESRCH;
 
@@ -85,7 +85,7 @@ static int hvmop_set_pci_intx_level(
     if ( (op.domain > 0) || (op.bus > 0) || (op.device > 31) || (op.intx > 3) )
         return -EINVAL;
 
-    d = find_domain_by_id(op.domid);
+    d = get_domain_by_id(op.domid);
     if ( d == NULL )
         return -ESRCH;
 
@@ -126,7 +126,7 @@ do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg)
             d = current->domain;
         }
         else if (IS_PRIV(current->domain)) {
-            d = find_domain_by_id(a.domid);
+            d = get_domain_by_id(a.domid);
             if (d == NULL)
                 return -ESRCH;
         }

diff --git a/xen/arch/ia64/xen/dom0_ops.c b/xen/arch/ia64/xen/dom0_ops.c
index 980a05a4d88f04c604360b3160af8950157bb181..52c3745f8795fba9f7cc5baaa2fdff29c059f5e6 100644 (file)
--- a/xen/arch/ia64/xen/dom0_ops.c
+++ b/xen/arch/ia64/xen/dom0_ops.c
@@ -40,7 +40,7 @@ long arch_do_domctl(xen_domctl_t *op, XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
     case XEN_DOMCTL_getmemlist:
     {
         unsigned long i;
-        struct domain *d = find_domain_by_id(op->domain);
+        struct domain *d = get_domain_by_id(op->domain);
         unsigned long start_page = op->u.getmemlist.start_pfn;
         unsigned long nr_pages = op->u.getmemlist.max_pfns;
         uint64_t mfn;
@@ -76,7 +76,7 @@ long arch_do_domctl(xen_domctl_t *op, XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
     case XEN_DOMCTL_arch_setup:
     {
         xen_domctl_arch_setup_t *ds = &op->u.arch_setup;
-        struct domain *d = find_domain_by_id(op->domain);
+        struct domain *d = get_domain_by_id(op->domain);
 
         if ( d == NULL) {
             ret = -EINVAL;
@@ -140,7 +140,7 @@ long arch_do_domctl(xen_domctl_t *op, XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
     {
         struct domain *d; 
         ret = -ESRCH;
-        d = find_domain_by_id(op->domain);
+        d = get_domain_by_id(op->domain);
         if ( d != NULL )
         {
             ret = shadow_mode_control(d, &op->u.shadow_op);
@@ -158,7 +158,7 @@ long arch_do_domctl(xen_domctl_t *op, XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
         unsigned int lp = fp + np - 1;
 
         ret = -ESRCH;
-        d = find_domain_by_id(op->domain);
+        d = get_domain_by_id(op->domain);
         if (unlikely(d == NULL))
             break;
 

diff --git a/xen/arch/ia64/xen/mm.c b/xen/arch/ia64/xen/mm.c
index aec322870c6e437a7d91cf2531c69290d06ecf31..5cdb25c39755a60d8c6d22aeaa7af245928c407f 100644 (file)
--- a/xen/arch/ia64/xen/mm.c
+++ b/xen/arch/ia64/xen/mm.c
@@ -1274,7 +1274,7 @@ __dom0vp_add_physmap(struct domain* d, unsigned long gpfn,
     if (flags & (ASSIGN_nocache | ASSIGN_pgc_allocated))
         return -EINVAL;
 
-    rd = find_domain_by_id(domid);
+    rd = get_domain_by_id(domid);
     if (unlikely(rd == NULL)) {
         switch (domid) {
         case DOMID_XEN:
@@ -2055,7 +2055,7 @@ arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
         }
         else if (!IS_PRIV(current->domain))
             return -EPERM;
-        else if ((d = find_domain_by_id(xatp.domid)) == NULL)
+        else if ((d = get_domain_by_id(xatp.domid)) == NULL)
             return -ESRCH;
 
         /* This hypercall is used for VT-i domain only */

diff --git a/xen/arch/powerpc/domctl.c b/xen/arch/powerpc/domctl.c
index a123df5581f2df0a255ce24cb855d7255bd71e58..082945c635dbb3f8a9fe4109f5ec5b3935a7711a 100644 (file)
--- a/xen/arch/powerpc/domctl.c
+++ b/xen/arch/powerpc/domctl.c
@@ -47,7 +47,7 @@ long arch_do_domctl(struct xen_domctl *domctl,
     case XEN_DOMCTL_getmemlist:
     {
         int i;
-        struct domain *d = find_domain_by_id(domctl->domain);
+        struct domain *d = get_domain_by_id(domctl->domain);
         unsigned long max_pfns = domctl->u.getmemlist.max_pfns;
         uint64_t mfn;
         struct list_head *list_ent;
@@ -84,7 +84,7 @@ long arch_do_domctl(struct xen_domctl *domctl,
     {
         struct domain *d;
         ret = -ESRCH;
-        d = find_domain_by_id(domctl->domain);
+        d = get_domain_by_id(domctl->domain);
         if ( d != NULL )
         {
             ret = shadow_domctl(d, &domctl->u.shadow_op, u_domctl);
@@ -99,7 +99,7 @@ long arch_do_domctl(struct xen_domctl *domctl,
         unsigned int order = domctl->u.real_mode_area.log - PAGE_SHIFT;
 
         ret = -ESRCH;
-        d = find_domain_by_id(domctl->domain);
+        d = get_domain_by_id(domctl->domain);
         if (d != NULL) {
             ret = -EINVAL;
             if (cpu_rma_valid(order))

diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index e3c28e6c0b5cd1e5fb72db2e43f9949003bc7c04..9646b96507462baad582bcb62d0504eb2f292c75 100644 (file)
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -39,7 +39,7 @@ long arch_do_domctl(
     {
         struct domain *d;
         ret = -ESRCH;
-        d = find_domain_by_id(domctl->domain);
+        d = get_domain_by_id(domctl->domain);
         if ( d != NULL )
         {
             ret = shadow_domctl(d,
@@ -62,7 +62,7 @@ long arch_do_domctl(
             break;
 
         ret = -ESRCH;
-        if ( unlikely((d = find_domain_by_id(domctl->domain)) == NULL) )
+        if ( unlikely((d = get_domain_by_id(domctl->domain)) == NULL) )
             break;
 
         if ( np == 0 )
@@ -86,7 +86,7 @@ long arch_do_domctl(
         ret = -EINVAL;
 
         if ( unlikely(!mfn_valid(mfn)) ||
-             unlikely((d = find_domain_by_id(dom)) == NULL) )
+             unlikely((d = get_domain_by_id(dom)) == NULL) )
             break;
 
         page = mfn_to_page(mfn);
@@ -134,7 +134,7 @@ long arch_do_domctl(
         uint32_t *arr32;
         ret = -ESRCH;
 
-        if ( unlikely((d = find_domain_by_id(dom)) == NULL) )
+        if ( unlikely((d = get_domain_by_id(dom)) == NULL) )
             break;
 
         if ( unlikely(num > 1024) )
@@ -217,7 +217,7 @@ long arch_do_domctl(
     case XEN_DOMCTL_getmemlist:
     {
         int i;
-        struct domain *d = find_domain_by_id(domctl->domain);
+        struct domain *d = get_domain_by_id(domctl->domain);
         unsigned long max_pfns = domctl->u.getmemlist.max_pfns;
         uint64_t mfn;
         struct list_head *list_ent;
@@ -255,7 +255,7 @@ long arch_do_domctl(
 
     case XEN_DOMCTL_hypercall_init:
     {
-        struct domain *d = find_domain_by_id(domctl->domain);
+        struct domain *d = get_domain_by_id(domctl->domain);
         unsigned long gmfn = domctl->u.hypercall_init.gmfn;
         unsigned long mfn;
         void *hypercall_page;
@@ -293,7 +293,7 @@ long arch_do_domctl(
         struct vcpu               *v;
 
         ret = -ESRCH;
-        if ( (d = find_domain_by_id(domctl->domain)) == NULL )
+        if ( (d = get_domain_by_id(domctl->domain)) == NULL )
             break;
 
         ret = -ENOMEM;
@@ -324,7 +324,7 @@ long arch_do_domctl(
         struct vcpu               *v;
 
         ret = -ESRCH;
-        if ( (d = find_domain_by_id(domctl->domain)) == NULL )
+        if ( (d = get_domain_by_id(domctl->domain)) == NULL )
             break;
 
         ret = -ENOMEM;
@@ -360,7 +360,7 @@ long arch_do_domctl(
         struct domain *d;
 
         ret = -ESRCH;
-        if ( (d = find_domain_by_id(domctl->domain)) == NULL )
+        if ( (d = get_domain_by_id(domctl->domain)) == NULL )
             break;
 
         switch ( domctl->u.address_size.size )
@@ -386,7 +386,7 @@ long arch_do_domctl(
         struct domain *d;
 
         ret = -ESRCH;
-        if ( (d = find_domain_by_id(domctl->domain)) == NULL )
+        if ( (d = get_domain_by_id(domctl->domain)) == NULL )
             break;
 
         domctl->u.address_size.size = BITS_PER_GUEST_LONG(d);

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index c3ba2b233c1bf0205762df419c22eafa3c6847dd..5676a9ad80f97efc3e0d97e094bf8ae2905af3e3 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -674,7 +674,7 @@ static int hvmop_set_pci_intx_level(
     if ( (op.domain > 0) || (op.bus > 0) || (op.device > 31) || (op.intx > 3) )
         return -EINVAL;
 
-    d = find_domain_by_id(op.domid);
+    d = get_domain_by_id(op.domid);
     if ( d == NULL )
         return -ESRCH;
 
@@ -717,7 +717,7 @@ static int hvmop_set_isa_irq_level(
     if ( op.isa_irq > 15 )
         return -EINVAL;
 
-    d = find_domain_by_id(op.domid);
+    d = get_domain_by_id(op.domid);
     if ( d == NULL )
         return -ESRCH;
 
@@ -760,7 +760,7 @@ static int hvmop_set_pci_link_route(
     if ( (op.link > 3) || (op.isa_irq > 15) )
         return -EINVAL;
 
-    d = find_domain_by_id(op.domid);
+    d = get_domain_by_id(op.domid);
     if ( d == NULL )
         return -ESRCH;
 
@@ -805,7 +805,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg)
         }
         else if ( IS_PRIV(current->domain) )
         {
-            d = find_domain_by_id(a.domid);
+            d = get_domain_by_id(a.domid);
             if ( d == NULL )
                 return -ESRCH;
         }

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 49501411e68761e7887c2795b2c3fd508d670d90..f23638cdb9eaaa4585ec0f7d44791d5362586695 100644 (file)
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -1882,7 +1882,7 @@ static int set_foreigndom(domid_t domid)
     }
     else
     {
-        info->foreign = e = find_domain_by_id(domid);
+        info->foreign = e = get_domain_by_id(domid);
         if ( e == NULL )
         {
             switch ( domid )
@@ -2963,7 +2963,7 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
         }
         else if ( !IS_PRIV(current->domain) )
             return -EPERM;
-        else if ( (d = find_domain_by_id(xatp.domid)) == NULL )
+        else if ( (d = get_domain_by_id(xatp.domid)) == NULL )
             return -ESRCH;
 
         switch ( xatp.space )
@@ -3034,7 +3034,7 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
         }
         else if ( !IS_PRIV(current->domain) )
             return -EPERM;
-        else if ( (d = find_domain_by_id(fmap.domid)) == NULL )
+        else if ( (d = get_domain_by_id(fmap.domid)) == NULL )
             return -ESRCH;
 
         rc = copy_from_guest(&d->arch.e820[0], fmap.map.buffer,

diff --git a/xen/common/acm_ops.c b/xen/common/acm_ops.c
index f9d8a72da63400ea2571c30e33fab2cf96e8c870..ce4074277c190ae89fb66597e207aace442bb654 100644 (file)
--- a/xen/common/acm_ops.c
+++ b/xen/common/acm_ops.c
@@ -115,7 +115,7 @@ ret_t do_acm_op(int cmd, XEN_GUEST_HANDLE(void) arg)
             ssidref = getssid.id.ssidref;
         else if (getssid.get_ssid_by == ACM_GETBY_domainid)
         {
-            struct domain *subj = find_domain_by_id(getssid.id.domainid);
+            struct domain *subj = get_domain_by_id(getssid.id.domainid);
             if (!subj)
             {
                 rc = -ESRCH; /* domain not found */
@@ -152,7 +152,7 @@ ret_t do_acm_op(int cmd, XEN_GUEST_HANDLE(void) arg)
             ssidref1 = getdecision.id1.ssidref;
         else if (getdecision.get_decision_by1 == ACM_GETBY_domainid)
         {
-            struct domain *subj = find_domain_by_id(getdecision.id1.domainid);
+            struct domain *subj = get_domain_by_id(getdecision.id1.domainid);
             if (!subj)
             {
                 rc = -ESRCH; /* domain not found */
@@ -176,7 +176,7 @@ ret_t do_acm_op(int cmd, XEN_GUEST_HANDLE(void) arg)
             ssidref2 = getdecision.id2.ssidref;
         else if (getdecision.get_decision_by2 == ACM_GETBY_domainid)
         {
-            struct domain *subj = find_domain_by_id(getdecision.id2.domainid);
+            struct domain *subj = get_domain_by_id(getdecision.id2.domainid);
             if (!subj)
             {
                 rc = -ESRCH; /* domain not found */

diff --git a/xen/common/domain.c b/xen/common/domain.c
index d9f83153433044b6dcfb3f9464242c1828c53202..7ec09b9d81e82820677f150025a01d25ea62ed72 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -203,7 +203,7 @@ struct domain *domain_create(domid_t domid, unsigned int domcr_flags)
 }
 
 
-struct domain *find_domain_by_id(domid_t dom)
+struct domain *get_domain_by_id(domid_t dom)
 {
     struct domain *d;
 

diff --git a/xen/common/domctl.c b/xen/common/domctl.c
index b79208ac08ccc3649bb69e1c97b5ca4342b14211..b3df79ba5346a8343b0306f0ac2a6c239262878f 100644 (file)
--- a/xen/common/domctl.c
+++ b/xen/common/domctl.c
@@ -73,7 +73,7 @@ static inline int is_free_domid(domid_t dom)
     if ( dom >= DOMID_FIRST_RESERVED )
         return 0;
 
-    if ( (d = find_domain_by_id(dom)) == NULL )
+    if ( (d = get_domain_by_id(dom)) == NULL )
         return 1;
 
     put_domain(d);
@@ -196,7 +196,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
 
     case XEN_DOMCTL_setvcpucontext:
     {
-        struct domain *d = find_domain_by_id(op->domain);
+        struct domain *d = get_domain_by_id(op->domain);
         vcpu_guest_context_u c = { .nat = NULL };
         unsigned int vcpu = op->u.vcpucontext.vcpu;
         struct vcpu *v;
@@ -248,7 +248,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
 
     case XEN_DOMCTL_pausedomain:
     {
-        struct domain *d = find_domain_by_id(op->domain);
+        struct domain *d = get_domain_by_id(op->domain);
         ret = -ESRCH;
         if ( d != NULL )
         {
@@ -265,7 +265,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
 
     case XEN_DOMCTL_unpausedomain:
     {
-        struct domain *d = find_domain_by_id(op->domain);
+        struct domain *d = get_domain_by_id(op->domain);
         ret = -ESRCH;
         if ( d != NULL )
         {
@@ -283,7 +283,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
 
     case XEN_DOMCTL_resumedomain:
     {
-        struct domain *d = find_domain_by_id(op->domain);
+        struct domain *d = get_domain_by_id(op->domain);
         struct vcpu *v;
 
         ret = -ESRCH;
@@ -367,7 +367,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
             break;
 
         ret = -ESRCH;
-        if ( (d = find_domain_by_id(op->domain)) == NULL )
+        if ( (d = get_domain_by_id(op->domain)) == NULL )
             break;
 
         /* Needed, for example, to ensure writable p.t. state is synced. */
@@ -402,7 +402,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
 
     case XEN_DOMCTL_destroydomain:
     {
-        struct domain *d = find_domain_by_id(op->domain);
+        struct domain *d = get_domain_by_id(op->domain);
         ret = -ESRCH;
         if ( d != NULL )
         {
@@ -421,7 +421,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
     case XEN_DOMCTL_getvcpuaffinity:
     {
         domid_t dom = op->domain;
-        struct domain *d = find_domain_by_id(dom);
+        struct domain *d = get_domain_by_id(dom);
         struct vcpu *v;
         cpumask_t new_affinity;
 
@@ -460,7 +460,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
         struct domain *d;
 
         ret = -ESRCH;
-        if ( (d = find_domain_by_id(op->domain)) == NULL )
+        if ( (d = get_domain_by_id(op->domain)) == NULL )
             break;
 
         ret = sched_adjust(d, &op->u.scheduler_op);
@@ -514,7 +514,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
         struct vcpu         *v;
 
         ret = -ESRCH;
-        if ( (d = find_domain_by_id(op->domain)) == NULL )
+        if ( (d = get_domain_by_id(op->domain)) == NULL )
             break;
 
         ret = -EINVAL;
@@ -570,7 +570,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
         struct vcpu_runstate_info runstate;
 
         ret = -ESRCH;
-        if ( (d = find_domain_by_id(op->domain)) == NULL )
+        if ( (d = get_domain_by_id(op->domain)) == NULL )
             break;
 
         ret = -EINVAL;
@@ -604,7 +604,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
         unsigned long new_max;
 
         ret = -ESRCH;
-        d = find_domain_by_id(op->domain);
+        d = get_domain_by_id(op->domain);
         if ( d == NULL )
             break;
 
@@ -627,7 +627,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
     {
         struct domain *d;
         ret = -ESRCH;
-        d = find_domain_by_id(op->domain);
+        d = get_domain_by_id(op->domain);
         if ( d != NULL )
         {
             memcpy(d->handle, op->u.setdomainhandle.handle,
@@ -642,7 +642,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
     {
         struct domain *d;
         ret = -ESRCH;
-        d = find_domain_by_id(op->domain);
+        d = get_domain_by_id(op->domain);
         if ( d != NULL )
         {
             if ( op->u.setdebugging.enable )
@@ -665,7 +665,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
             break;
 
         ret = -ESRCH;
-        d = find_domain_by_id(op->domain);
+        d = get_domain_by_id(op->domain);
         if ( d == NULL )
             break;
 
@@ -689,7 +689,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
             break;
 
         ret = -ESRCH;
-        d = find_domain_by_id(op->domain);
+        d = get_domain_by_id(op->domain);
         if ( d == NULL )
             break;
 
@@ -707,7 +707,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
         struct domain *d;
 
         ret = -ESRCH;
-        d = find_domain_by_id(op->domain);
+        d = get_domain_by_id(op->domain);
         if ( d != NULL )
         {
             d->time_offset_seconds = op->u.settimeoffset.time_offset_seconds;

diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c
index 0116a9aa91a9f77221795fc58a6725f4c80ffabf..13b5d11acfcb1d9a529b3847eaf9745d52ffeaae 100644 (file)
--- a/xen/common/event_channel.c
+++ b/xen/common/event_channel.c
@@ -112,7 +112,7 @@ static long evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc)
     else if ( !IS_PRIV(current->domain) )
         return -EPERM;
 
-    if ( (d = find_domain_by_id(dom)) == NULL )
+    if ( (d = get_domain_by_id(dom)) == NULL )
         return -ESRCH;
 
     spin_lock(&d->evtchn_lock);
@@ -150,7 +150,7 @@ static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind)
     if ( rdom == DOMID_SELF )
         rdom = current->domain->domain_id;
 
-    if ( (rd = find_domain_by_id(rdom)) == NULL )
+    if ( (rd = get_domain_by_id(rdom)) == NULL )
         return -ESRCH;
 
     /* Avoid deadlock by first acquiring lock of domain with smaller id. */
@@ -598,7 +598,7 @@ static long evtchn_status(evtchn_status_t *status)
     else if ( !IS_PRIV(current->domain) )
         return -EPERM;
 
-    if ( (d = find_domain_by_id(dom)) == NULL )
+    if ( (d = get_domain_by_id(dom)) == NULL )
         return -ESRCH;
 
     spin_lock(&d->evtchn_lock);
@@ -746,7 +746,7 @@ static long evtchn_reset(evtchn_reset_t *r)
     else if ( !IS_PRIV(current->domain) )
         return -EPERM;
 
-    if ( (d = find_domain_by_id(dom)) == NULL )
+    if ( (d = get_domain_by_id(dom)) == NULL )
         return -ESRCH;
 
     for ( i = 0; port_is_valid(d, i); i++ )

diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index 3df8af4116697473fa8194ffd2b52088895d9529..c2f899975148a492ce122116555c5c74d4635c25 100644 (file)
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -123,7 +123,7 @@ __gnttab_map_grant_ref(
         return;
     }
 
-    if ( unlikely((rd = find_domain_by_id(op->dom)) == NULL) )
+    if ( unlikely((rd = get_domain_by_id(op->dom)) == NULL) )
     {
         if ( rd != NULL )
             put_domain(rd);
@@ -369,7 +369,7 @@ __gnttab_unmap_grant_ref(
     ref   = map->ref;
     flags = map->flags;
 
-    if ( unlikely((rd = find_domain_by_id(dom)) == NULL) )
+    if ( unlikely((rd = get_domain_by_id(dom)) == NULL) )
     {
         /* This can happen when a grant is implicitly unmapped. */
         gdprintk(XENLOG_INFO, "Could not find domain %d\n", dom);
@@ -516,7 +516,7 @@ gnttab_setup_table(
         goto out;
     }
 
-    if ( unlikely((d = find_domain_by_id(dom)) == NULL) )
+    if ( unlikely((d = get_domain_by_id(dom)) == NULL) )
     {
         gdprintk(XENLOG_INFO, "Bad domid %d.\n", dom);
         op.status = GNTST_bad_domain;
@@ -653,7 +653,7 @@ gnttab_transfer(
         }
 
         /* Find the target domain. */
-        if ( unlikely((e = find_domain_by_id(gop.domid)) == NULL) )
+        if ( unlikely((e = get_domain_by_id(gop.domid)) == NULL) )
         {
             gdprintk(XENLOG_INFO, "gnttab_transfer: can't find domain %d\n",
                     gop.domid);
@@ -866,7 +866,7 @@ __gnttab_copy(
         sd = current->domain;
         get_knownalive_domain(sd);
     }
-    else if ( (sd = find_domain_by_id(op->source.domid)) == NULL )
+    else if ( (sd = get_domain_by_id(op->source.domid)) == NULL )
     {
         PIN_FAIL(error_out, GNTST_bad_domain,
                  "couldn't find %d\n", op->source.domid);
@@ -877,7 +877,7 @@ __gnttab_copy(
         dd = current->domain;
         get_knownalive_domain(dd);
     }
-    else if ( (dd = find_domain_by_id(op->dest.domid)) == NULL )
+    else if ( (dd = get_domain_by_id(op->dest.domid)) == NULL )
     {
         PIN_FAIL(error_out, GNTST_bad_domain,
                  "couldn't find %d\n", op->dest.domid);
@@ -1132,7 +1132,7 @@ gnttab_release_mappings(
                 "flags:(%x) dom:(%hu)\n",
                 handle, ref, map->flags, map->domid);
 
-        rd = find_domain_by_id(map->domid);
+        rd = get_domain_by_id(map->domid);
         if ( rd == NULL )
         {
             /* Nothing to clear up... */

diff --git a/xen/common/memory.c b/xen/common/memory.c
index 1d9e6d1044246bce664ba230f6f7a77a91a78385..78887e19a6fe7bcbc76f44b98897625b9b178a06 100644 (file)
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -242,7 +242,7 @@ static long translate_gpfn_list(
     else if ( !IS_PRIV(current->domain) )
         return -EPERM;
 
-    if ( (d = find_domain_by_id(op.domid)) == NULL )
+    if ( (d = get_domain_by_id(op.domid)) == NULL )
         return -ESRCH;
 
     if ( !shadow_mode_translate(d) )
@@ -543,7 +543,7 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE(void) arg)
         if ( likely(reservation.domid == DOMID_SELF) )
             d = current->domain;
         else if ( !IS_PRIV(current->domain) ||
-                  ((d = find_domain_by_id(reservation.domid)) == NULL) )
+                  ((d = get_domain_by_id(reservation.domid)) == NULL) )
             return start_extent;
         args.domain = d;
 
@@ -589,7 +589,7 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE(void) arg)
             d = current->domain;
         else if ( !IS_PRIV(current->domain) )
             return -EPERM;
-        else if ( (d = find_domain_by_id(domid)) == NULL )
+        else if ( (d = get_domain_by_id(domid)) == NULL )
             return -ESRCH;
 
         rc = (op == XENMEM_current_reservation) ? d->tot_pages : d->max_pages;

diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index 55abd5f5caebaff765a37c7dd25bf63b56c9d96b..8f1f755d277e985f52b6ffd494c8603543e935a6 100644 (file)
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -430,7 +430,7 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE(void) arg)
             break;
 
         ret = -ESRCH;
-        d = find_domain_by_id(sched_remote_shutdown.domain_id);
+        d = get_domain_by_id(sched_remote_shutdown.domain_id);
         if ( d == NULL )
             break;
 

diff --git a/xen/common/xenoprof.c b/xen/common/xenoprof.c
index d61e3f173e5f4a7715f64818cb2cc456e9f8e71a..7e2a04bb5c2c9c50cc8e7b4370b4523b0964fd1e 100644 (file)
--- a/xen/common/xenoprof.c
+++ b/xen/common/xenoprof.c
@@ -346,7 +346,7 @@ static int add_active_list(domid_t domid)
     if ( adomains >= MAX_OPROF_DOMAINS )
         return -E2BIG;
 
-    d = find_domain_by_id(domid);
+    d = get_domain_by_id(domid);
     if ( d == NULL )
         return -EINVAL;
 
@@ -369,7 +369,7 @@ static int add_passive_list(XEN_GUEST_HANDLE(void) arg)
     if ( copy_from_guest(&passive, arg, 1) )
         return -EFAULT;
 
-    d = find_domain_by_id(passive.domain_id);
+    d = get_domain_by_id(passive.domain_id);
     if ( d == NULL )
         return -EINVAL;
 

diff --git a/xen/include/acm/acm_hooks.h b/xen/include/acm/acm_hooks.h
index 4e956fca98b399fff99f95ccabc659a2232f1c29..e37b9ede191ee60521aa97bcd8de125b4ee4bdd3 100644 (file)
--- a/xen/include/acm/acm_hooks.h
+++ b/xen/include/acm/acm_hooks.h
@@ -241,7 +241,7 @@ static inline int acm_pre_domctl(struct xen_domctl *op, void **ssid)
                     __func__);
             return -EACCES;
         }
-        d = find_domain_by_id(op->domain);
+        d = get_domain_by_id(op->domain);
         if (d != NULL) {
             *ssid = d->ssid; /* save for post destroy when d is gone */
             if (*ssid == NULL) {

diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index a34a4d07ac02acdb0a0de8efc1f718b03ad76adf..3b7a9f390f9d4d75605c678e2347905e0fff03c2 100644 (file)
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -276,7 +276,7 @@ int construct_dom0(
     unsigned long initrd_start, unsigned long initrd_len,
     char *cmdline);
 
-struct domain *find_domain_by_id(domid_t dom);
+struct domain *get_domain_by_id(domid_t dom);
 void domain_destroy(struct domain *d);
 void domain_kill(struct domain *d);
 void domain_shutdown(struct domain *d, u8 reason);